From: chris@kneesaa.uk.xensource.com <chris@kneesaa.uk.xensource.com>
Date: Thu, 3 Aug 2006 18:19:27 +0000 (+0100)
Subject: [qemu patches] Update patches for changeset 10923:155385a02d.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15732^2~73
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=fff236de340a7c3ade7dfbabaf5a36669721850c;p=xen.git

[qemu patches] Update patches for changeset 10923:155385a02d.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
---

diff --git a/tools/ioemu/patches/series b/tools/ioemu/patches/series
index 8f20f6e166..6a32aa2256 100644
--- a/tools/ioemu/patches/series
+++ b/tools/ioemu/patches/series
@@ -36,3 +36,4 @@ vnc-start-vncviewer
 vnc-title-domain-name
 vnc-access-monitor-vt
 xenstore-block-device-config
+xenstore-write-vnc-port
diff --git a/tools/ioemu/patches/xenstore-write-vnc-port b/tools/ioemu/patches/xenstore-write-vnc-port
new file mode 100644
index 0000000000..1d49ef51d8
--- /dev/null
+++ b/tools/ioemu/patches/xenstore-write-vnc-port
@@ -0,0 +1,60 @@
+Index: ioemu/xenstore.c
+===================================================================
+--- ioemu.orig/xenstore.c	2006-08-03 19:17:18.496119877 +0100
++++ ioemu/xenstore.c	2006-08-03 19:18:29.428258503 +0100
+@@ -185,3 +185,31 @@
+     free(image);
+     free(vec);
+ }
++
++void xenstore_write_vncport(int display)
++{
++    char *buf = NULL, *path;
++    char *portstr = NULL;
++
++    if (xsh == NULL)
++	return;
++
++    path = xs_get_domain_path(xsh, domid);
++    if (path == NULL) {
++        fprintf(logfile, "xs_get_domain_path() error\n");
++        goto out;
++    }
++
++    if (pasprintf(&buf, "%s/console/vnc-port", path) == -1)
++	goto out;
++
++    if (pasprintf(&portstr, "%d", 5900 + display) == -1)
++	goto out;
++
++    if (xs_write(xsh, XBT_NULL, buf, portstr, strlen(portstr)) == 0)
++        fprintf(logfile, "xs_write() vncport failed\n");
++
++ out:
++    free(portstr);
++    free(buf);
++}
+Index: ioemu/vl.c
+===================================================================
+--- ioemu.orig/vl.c	2006-08-03 19:17:18.499119544 +0100
++++ ioemu/vl.c	2006-08-03 19:18:29.427258614 +0100
+@@ -5954,6 +5954,7 @@
+ 	vnc_display_init(ds, vnc_display);
+ 	if (vncviewer)
+ 	    vnc_start_viewer(vnc_display);
++	xenstore_write_vncport(vnc_display);
+     } else {
+ #if defined(CONFIG_SDL)
+         sdl_display_init(ds, full_screen);
+Index: ioemu/vl.h
+===================================================================
+--- ioemu.orig/vl.h	2006-08-03 19:17:18.501119323 +0100
++++ ioemu/vl.h	2006-08-03 19:18:29.428258503 +0100
+@@ -1111,6 +1111,7 @@
+ int xenstore_fd(void);
+ void xenstore_process_event(void *opaque);
+ void xenstore_check_new_media_present(int timeout);
++void xenstore_write_vncport(int vnc_display);
+ 
+ 
+ void kqemu_record_dump(void);